Avoid abort in ftfont.c due to faulty fonts

* src/ftfont.c (ftfont_get_metrics): Try loading the font without
hinting, before aborting.  (Bug#25945)

diff --git a/src/ftfont.c b/src/ftfont.c
index 6cabddda370b36354dc0b3e37ea2e78a14a7ba17..5600bde646da4a0b88d66e3f432a947885ca843b 100644 (file)
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1546,7 +1546,8 @@ ftfont_get_metrics (MFLTFont *font, MFLTGlyphString *gstring,
          {
            FT_Glyph_Metrics *m;
 
-           if (FT_Load_Glyph (ft_face, g->g.code, FT_LOAD_DEFAULT) != 0)
+           if (FT_Load_Glyph (ft_face, g->g.code, FT_LOAD_DEFAULT) != 0
+               && FT_Load_Glyph (ft_face, g->g.code, FT_LOAD_NO_HINTING) != 0)
              emacs_abort ();
            m = &ft_face->glyph->metrics;
            if (flt_font_ft->matrix)